copyright refresh

diff --git a/debian/changelog b/debian/changelog
index e6384c85bfb3fb2faccf7f98bd9a072384ee52fd..50080d72d6c2ceb66687e7c350e49ed462d7761c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ncbi-blast+ (2.9.0-3) UNRELEASED; urgency=medium
 
   * Team upload.
   * Drop transitional blast2 package. (Closes: #940742).
+  * debian/copyright: refreshed
 
  -- Michael R. Crusoe <michael.crusoe@gmail.com>  Sun, 29 Sep 2019 13:29:30 +0200
 

diff --git a/debian/copyright b/debian/copyright
index 308cdd76ec8c91948cd543f4f97617b8d92d3d76..d818886bbbd5bd2ba8d641e4a4c7c1c28cf4f6e0 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,29 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ncbi-blast+
 Upstream-Contact: blastsoft@ncbi.nlm.nih.gov
 
+Files: c++/*
+Copyright: NCBI
+License: PD
+                                  PUBLIC DOMAIN NOTICE
+                     National Center for Biotechnology Information
+ .
+        This software/database is a "United States Government Work" under the
+        terms of the United States Copyright Act.  It was written as part of
+        the author's official duties as a United States Government employee and
+        thus cannot be copyrighted.  This software/database is freely available
+        to the public for use. The National Library of Medicine and the U.S.
+        Government have not placed any restriction on its use or reproduction.
+ .
+        Although all reasonable efforts have been taken to ensure the accuracy
+        and reliability of the software and data, the NLM and the U.S.
+        Government do not and cannot warrant the performance or results that
+        may be obtained by using this software or data. The NLM and the U.S.
+        Government disclaim all warranties, express or implied, including
+        warranties of performance, merchantability or fitness for any particular
+        purpose.
+ .
+        Please cite the author in any work or product based on this material.
+
 Files: c++/src/connect/mbedtls/*
 Copyright: 2006-2015, ARM Limited, All Rights Reserved
 License: Apache-2.0
@@ -27,29 +50,6 @@ License: Netscape
  software provided that this copyright notice appears on all copies.
  This software is provided "AS IS," without a warranty of any kind.
 
-Files: c++/*
-Copyright: NCBI
-License: PD
-                                  PUBLIC DOMAIN NOTICE
-                     National Center for Biotechnology Information
- .
-        This software/database is a "United States Government Work" under the
-        terms of the United States Copyright Act.  It was written as part of
-        the author's official duties as a United States Government employee and
-        thus cannot be copyrighted.  This software/database is freely available
-        to the public for use. The National Library of Medicine and the U.S.
-        Government have not placed any restriction on its use or reproduction.
- .
-        Although all reasonable efforts have been taken to ensure the accuracy
-        and reliability of the software and data, the NLM and the U.S.
-        Government do not and cannot warrant the performance or results that
-        may be obtained by using this software or data. The NLM and the U.S.
-        Government disclaim all warranties, express or implied, including
-        warranties of performance, merchantability or fitness for any particular
-        purpose.
- .
-        Please cite the author in any work or product based on this material.
-
 Files: c++/*/util/compress/zlib/*
 Copyright: 1995-2004 Jean-loup Gailly and Mark Adler
 License: BSD-3-clause
@@ -106,11 +106,11 @@ License: BSD-4-clause
  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Files: c++/src/build-system/config.*s* c++/src/util/regexp/missing
+Files: c++/src/build-system/config.*s*
 Copyright: 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc
 License: GPL-2
 
-Files: c++/src/build-system/ax_jni_include_dir.m4
+Files: c++/src/build-system/m4/ax_jni_include_dir.m4
 Copyright: 2008 Don Anderson <dda@sleepycat.com>
 License: as_is
    Copying and distribution of this file, with or without modification, are